Merge branch 'master' of git://git.denx.de/u-boot
authorStefano Babic <[email protected]>
Tue, 9 May 2017 16:03:44 +0000 (18:03 +0200)
committerStefano Babic <[email protected]>
Tue, 9 May 2017 16:03:44 +0000 (18:03 +0200)
Signed-off-by: Stefano Babic <[email protected]>

Trivial merge